merge trunk
authorK. Handa <handa@gnu.org>
Sun, 19 Jan 2014 13:27:34 +0000 (22:27 +0900)
committerK. Handa <handa@gnu.org>
Sun, 19 Jan 2014 13:27:34 +0000 (22:27 +0900)

Trivial merge